Merge from trunk.
authorDavid Engster <dengste@eml.cc>
Thu, 25 Oct 2012 19:11:29 +0000 (21:11 +0200)
committerDavid Engster <dengste@eml.cc>
Thu, 25 Oct 2012 19:11:29 +0000 (21:11 +0200)
commited797f1bf7c4b71a1666098f662a90bbbc62e3fb
treef7f7db6a25a0829a035408f2491043333cd6d6c8
parent4666a60cd346e4c127bc9aeca85a41eba5f6faff
parent88da6a42b8636cfacb678e9d5d068a01879a40df
Merge from trunk.